[automerger skipped] Merge "Merge Android 14" into main am: 2d4c82a9b2 -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: I6d1b8110654341bf31b6e78874997aee873c05b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>