DeviceInfoSettings: Use ro.cm.display.version instead of ro.cm.version

Follows the same logic as ro.build.display.id/ro.build.id:
engineering, debug and unsigned builds will have no distinction,
user and signed builds will show a simplified version

Change-Id: I713ccb2445ea2e333e831129ef7733fd518282eb
Settings: recover last location state during on/off switch

based on the behaviour change on QS here:

https://gerrit.slimroms.net/#/c/1421

we go now same way in settings. Tbh not sure what the goal is to
force the user after switching off to enable always high accuracy
location. Whatever we use here same attempt like in QS tile....if the
user switches on again it recovers the last enabled state.

Change-Id: I887e2a94af379770dac7dbedb5d3d8002a554163

Conflicts:

	src/com/android/settings/location/LocationSettingsBase.java
Settings: Favorite Contact Tile (2/2)

PSX: Create Dependant

Change-Id: I938490f3cfd40d1abff193315f5d885010386107

Patchset: 3
https://gerrit.slimroms.net/#/c/1728/