[automerger skipped] Merge "Implement DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO...

[automerger skipped] Merge "Implement DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO AE user restriction" into main am: 6a7f1009 am: a8a87bbc -s ours am: 31b9cf7e -s ours

am skip reason: Merged-In Idbdce79a4fffe62f4daf3d378452a547e8871322 with SHA-1 a4178609 is already in history

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



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