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

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

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