[automerger skipped] Merge "Remove nfc HIDL entry in compat matrix." am: 870d2ac41a am: 86365129f2 am: e1c03aeb0a am: 89ee6501b0 am: bbe29732d7 -s ours

am skip reason: Merged-In I17e1afaf834170a4dc8d0c9c2bca3557131a3123 with SHA-1 7b2d27a90d 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>