[automerger skipped] Merge Android 12 am: f4be0e805a -s ours

am skip reason: Merged-In I3a661bed1ae2ee68896f860d7f694ac67bbb9475 with SHA-1 8fd5536b7d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/st/nfc/+/1847380

Change-Id: Ibcf3c5497e0c93b8eb9200099d933f2a9f858129