Merge "Remove usage of Telephonymanager from() hidden API"
am: 8e999f22b8

Change-Id: Icee4117f892b09ce3eafeb39668467cc2220f31b