[automerger skipped] Merge TQ2A.230405.003 am: 076790fdbf am: 073aa6f8d3 -s ours am: ac9ee4bb35 -s ours

am skip reason: Merged-In I89eec70c203837889419bc0bd8845230f9a4e150 with SHA-1 253cda9827 is already in history

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

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