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

Change-Id: Id5539c4177dbf5dec92add4e1150d6beea4907e5