[automerger skipped] Merge "Only allow NR override network types on SA" am:...

[automerger skipped] Merge "Only allow NR override network types on SA" am: fed28ed7 am: f0b12238 am: 1291f757 -s ours am: 079fb568 -s ours

am skip reason: Merged-In If34e8f4566fad4b2d7badce3ba2bf2813a63be1a with SHA-1 a344f5ee is already in history

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



Change-Id: I6839cc548129c2f0442c8a0c303ed55486e095f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>