[automerger skipped] Remove Nfc hidl settings am: b1a045dcf3
am: e355efbc63
am: 82eeb0143f
-s ours
am skip reason: Merged-In I5d1b4c47264adba2c8f517285fe603f1b4fa1188 with SHA-1 2624060835
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/18611812
Change-Id: I2eb5a1298050847faab67eb50a793ef5e6e99d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: