tree 2b86c004dc89fd7cf7a015fd29bf968cf2b6aef4
parent 0c7ec95f35e7c0c81a7634c10b750e57c58e2040
parent 98e6ab358bb51388db9eb81c08c21e67213177a7
author Bonian Chen <bonianchen@google.com> 1577332855 -0800
committer android-build-merger <android-build-merger@google.com> 1577332855 -0800

Merge "[Settings] Replace TelephonyManager#from()"
am: 98e6ab358b

Change-Id: I3db67a7e5037ab06ac5146e0367f759245d95246