Merge changes from topic "am-581b08134c1c4cda98e5d3d1de5ef17b" into tm-qpr-dev-plus-aosp

* changes:
  Merge "Switch NFC from HIDL to AIDL" into tm-d1-dev am: 1fac8143e4 am: 376d89791a
  Remove Nfc hidl settings am: f18fb66727 am: cef10f88e4
This commit is contained in:
Automerger Merge Worker 2022-06-01 07:01:49 +00:00 committed by Android (Google) Code Review
commit d07d803bbb

Diff content is not available