[automerger skipped] Merge changes from topics "ApiReview_DEVICE_NR_CAPABILITY", "getPhoneCapability" am: 8c19236f am: 2df532c0 -s ours

am skip reason: Merged-In Ia394537ec57900a410b283ddffdcead017e6d9c6 with SHA-1 83327175 is already in history

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

Change-Id: Iabae1466607eac6ae23bc818420de78fc23af54b