Merge "Remove getIntWithSubId in TelephonyManager." am: 10d1ee58f8
am: c7cebc8e8e

Change-Id: I50fdbebe3decd0dad93802fdf8fa722ab7c06d07