Merge "Remove nfc HIDL entry in compat matrix." am: 870d2ac4 am: 86365129 am: e1c03aeb

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



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