Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API."