tree a3e97ce6d7b823e9c0edd8d32373dd9c7ea7c1f8
parent 241bbaddf3c54982648b73ed392d502cd071700b
parent 38e058279786b5f906d44b708b44f0c90c0a266e
author Junyu Lai <junyulai@google.com> 1641477778 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641477778 +0000

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: I480abeaeb984f4fdfbeac006ab88cb9357e42fa5