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

Change-Id: Id0d95a636c5fb15d2ceefd1f0f4ce42f439630b9