tree ff585af9022ead7438e8aed36358c10d1e9e4edb
parent fd493b221aab6cbb43f1706e1589e83beb9bb687
parent 19cebd9eca5d1ec5fb1cd60238e59e11aa9dbdfc
author Bonian Chen <bonianchen@google.com> 1577068928 -0800
committer android-build-merger <android-build-merger@google.com> 1577068928 -0800

Merge "[Settings] Replace TelephonyManager#from()"
am: 19cebd9eca

Change-Id: Id5539c4177dbf5dec92add4e1150d6beea4907e5