[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: a9f74e4c8f -s ours

am skip reason: Change-Id I9a27d70c6b9cbc85956dcd7db0a44a827239135d with SHA-1 5254fe477b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/12470079

Change-Id: I97bd5dc12549f1c13635226c2089fdd638fd6800