[automerger skipped] Merge "Add the subId chceking before the DB write allowed network type" am: 48a7ef15cd am: 5b1a2e67c4 -s ours

am skip reason: Merged-In Ibcb1f7662e25570e5091b229142f73ac7aec8288 with SHA-1 7ffc273a0a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1754901

Change-Id: Iabc7ae0c1b8615f7c0bf91a16a1bec49835bf542