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