[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: d2c0104fe6 -s ours

am skip reason: Merged-In Ib1fe9c568fc21fd14b1c5f0b5bfe4d6f3ad55c61 with SHA-1 3899c1ec6b is already in history

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

Change-Id: I975ab606904764817bba8eff1cca15a4487ee09d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: c86d700907e562ff17a78b8fd049aea46da4c1a3
  1. intf/
  2. pn8x/
  3. snxxx/
  4. .clang-format
  5. Android.bp
  6. METADATA
  7. OWNERS
  8. PREUPLOAD.cfg