[automerger skipped] Merge QQ3A.200605.002 into master am: c3e97676d6 -s ours

am skip reason: Change-Id I64135373d30eb0b3fff00857c0909130bd0891f9 with SHA-1 ad4ea2a098 is in history

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

Change-Id: I75e692c9f32513e5e62e4cb5570d668f1f4b185a
tree: 8c7762d6abbc3507b14ef36fa209160cc6b543e7
  1. 1.1/
  2. 1.2/
  3. extns/
  4. halimpl/
  5. Android.bp
  6. METADATA
  7. OWNERS