Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API"