[automerger skipped] Merge "Merge "Expose TelephonyManager#getDeviceSoftwareVersion(int) as system API." am: 096cd20182 am: dd1f02d02e" into qt-qpr1-dev-plus-aosp
am: feb80c2665 -s ours
am skip reason: change_id I1cddd570d5c1203ca749be0ac78093df9e97ee3b with SHA1 65f65b2d6d is in history

Change-Id: Id9c9c4d36e7f55f89f06616fc3216c7c93caa261