Merge "Enable NFC HCE" into main am: ec30622b am: e4917661 am: 083c611a...

Merge "Enable NFC HCE" into main am: ec30622b am: e4917661 am: 083c611a am: 3a309765 am: 073b9b2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2737213



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