Merge "NFC logging enhancement" am: 4b00a10d66 am: 7c48f244bf am: 4aac68d341 Original change: https://android-review.googlesource.com/c/platform/system/nfc/+/2044873 Change-Id: Ice4c6bd9285d4a98fa09b3ecfc14b3bfd789f59a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>