[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "ApiReview_DEVICE_NR_CAPABILITY", "getPhoneCapability" am: 81f6c947 am: 1c9f026b -s ours am: 01fad276 -s ours

am skip reason: Merged-In I9b18993107c42fa386b08637d01502337a14e3b9 with SHA-1 dcbc535e is already in history

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

Change-Id: I2a27b2c3b25dfcb3f3f13fcaa063108dfe2e24b7