Merge "Add flag for nfc card detection" into main am: 7c69b8a1c5 am: 06251ca414 am: bbb2082937

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

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