Merge "Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API." am: 096cd20182 am: dd1f02d02e" into qt-qpr1-dev-plus-aosp