[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c0f97075b8 -s ours am: 3ee04fc455 -s ours am: 8ca680b6cc -s ours am: f1eb1d4974 -s ours

am skip reason: Merged-In I925cab817bb032534689e4789c6717365bc65dc5 with SHA-1 a0ba42539f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/nfc/+/17544961

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