Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API."
am: 096cd20182

Change-Id: Ic3c5cfa1b61621af1d99a60b326a15de0fc878bf