Merge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8 am: c7cebc8e8e
am: 0eff354771  -s ours

Change-Id: Idfb1d9169e05461bf534babfde9c991c479a58e8