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

Change-Id: Iacaba6224b25006eee4aa28de9e0b00197100732