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

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

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



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