Merge cherrypicks of [19413617] into tm-release. am: 77d60b9b34

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

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