[automerger skipped] Merge "Resolving NTN capability" into udc-qpr-dev am:...

[automerger skipped] Merge "Resolving NTN capability" into udc-qpr-dev am: 3a6b7ea6 am: 846376f0 -s ours

am skip reason: Merged-In Ifb3ee80b89ea5c2269f6591a1f42918265f7c92a with SHA-1 740931e5 is already in history

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



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