Merge "Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797 am: 13f0d24647 am: 1b69ac1a18 am: c29114ba64"