Merge "Implement DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO AE user restriction"...

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

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



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