[conflict] Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC...

[conflict] Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC testing" into main am: 03c81cdc

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




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

Merged-In: Id0233a614491173d48f6111fd0ef4bd9ce50d4a9
Change-Id: I970c29974712e3aab744cd7bd21411217ae64881