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
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: Ifd031bf1409cf71accd2e6d1bd8dfa78bd5a1c31