[automerger skipped] Merge "Remove nfc HIDL entry in compat matrix." am:...

[automerger skipped] Merge "Remove nfc HIDL entry in compat matrix." am: 870d2ac4 am: 86365129 am: e1c03aeb am: 89ee6501 am: bbe29732 -s ours

am skip reason: Merged-In I17e1afaf834170a4dc8d0c9c2bca3557131a3123 with SHA-1 7b2d27a9 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2182458



Change-Id: Id1151ca0bbf607968b49edd9e0942c152d030684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>