[automerger skipped] Merge changes from topics "nfc_aosp_main_merge", "nfc_aosp_main_merge_stage2" into main am: 3935a3fa -s ours am: 76b2515f -s ours

am skip reason: Merged-In I22393acc260d200d2e472d276c64af005a75ab6b with SHA-1 c07973b7 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3192000



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