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 branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into CyanogenMod-cm-11.0

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