[automerger skipped] Merge Android R am: efa54560d6 -s ours am: 33ea7c111b -s ours am: cd9bc9bb59 -s ours

am skip reason: Change-Id I6c989df8c8bcfbac6c5d1c14d2876de20192759b with SHA-1 a9f74e4c8f is in history

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

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