Merge "Enable NFC HCE" into main am: ec30622b36 am: e49176619d

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

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