Merge "Remove usage of TelecomManager.from() hidden API"
am: 07235288eb

Change-Id: Ic77adb515a9fea1dfa238908e3e4c754408d4103