[automerger skipped] Merge "Remove Nfc hidl settings am: b1a045dcf3
am: 3876caf151" into tm-qpr-dev-plus-aosp am: ee829f613d
-s ours
am skip reason: Merged-In I5d1b4c47264adba2c8f517285fe603f1b4fa1188 with SHA-1 b1a045dcf3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/18611812
Change-Id: I0974d229a89d7cbe75065d1af090785ed8e5b4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: