Merge "NFC logging enhancement" am: 4b00a10d66 am: 7c48f244bf am: 4aac68d341 am: 87d1b13f10 am: 71af74c271

Original change: https://android-review.googlesource.com/c/platform/system/nfc/+/2044873

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