[automerger skipped] Merge changes from topic "allowedNetworkSubIdChecking" am: 97083863 am: f2950bea -s ours

am skip reason: Merged-In I17dc6a2953ef8f12c211565813f2953f7e83a472 with SHA-1 7b678642 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1754900

Change-Id: Id552f9bc4697d23cb83b3eb7290900eedc3130f1