Merge "Implement DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO AE user restriction" into udc-dev-plus-aosp am: 2e75599006

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

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