[automerger skipped] Merge Android 14 am: fc167b13cc -s ours am: 2e36d63449 -s ours am: 136c589b08 -s ours am: 5076d36efc -s ours

am skip reason: Merged-In Iba64a513ed63fec30ce624db63aabc3fcea527d2 with SHA-1 99810e76d4 is already in history

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

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