Merge "Add flag for nfc card detection" into main am: 7c69b8a1

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



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