[automerger skipped] Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am: 510996f0f2 -s ours

am skip reason: Merged-In I2ea18958b4d1e7904e4b31d1930e0198119c8350 with SHA-1 8b3f9cf31c is already in history

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

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