[automerger skipped] [conflict] Merge "shell(nfc): Add...

[automerger skipped] [conflict] Merge "shell(nfc): Add NFC_SET_CONTROLLER_ALWAYS_ON for NFC testing" into main am: 03c81cdc am: b69a4ed2 -s ours

am skip reason: Merged-In Id0233a614491173d48f6111fd0ef4bd9ce50d4a9 with SHA-1 b970a30c is already in history

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



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