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

Change-Id: I3db67a7e5037ab06ac5146e0367f759245d95246