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

Change-Id: Ib6869f626d9cb5f085ab77c150e245dec904b6fb