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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970

Change-Id: Ia9d57163c3cac702480ab1b03ce6dba8cb3d189e