[automerger skipped] Merge "Add isNonTerrestrialNetwork apis in...

[automerger skipped] Merge "Add isNonTerrestrialNetwork apis in NetworkRegistrationInfo for satellite connectivity" into udc-qpr-dev am: 2d2f4a21 am: 5405d200 -s ours

am skip reason: Merged-In Idc106f26209c805cee898e7358574523617a3365 with SHA-1 4b8bfd8e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23504717



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