[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: d2c0104fe6 -s ours am: 542071f8e2 -s ours am: 72eefce9c7 -s ours am: 5d453a9613 -s ours am: eb0f138f17 -s ours am: ebdd640727 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I656a518efbab6f7bab84537a527bfcaeabfe532e
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