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

Change-Id: I196f28a694fc0c8ec35256938a53d2d093e263c1