Merge "Add T4T Ndef Nfceee feature support" into main am: f3e2a345ef am: fd3b8fa28b

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

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