Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs" am: 1dc2a0d7 am: 7798357a am: 6906046f Change-Id: If229255c7cc7af4ca1e8de7c6a2e493b3d6aafc3