Merge "Remove nfc HIDL entry in compat matrix." am: 870d2ac41a am: 86365129f2

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

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