Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"
am: 73e22ad21d

Change-Id: I555617ff893acf4c53e6a73d6591b6aaebf3ce50
tree: e371fb2f7944e0e0609f301daedb0b07597eab7d
  1. core/
  2. services/
  3. tests/