Merge "Add NfcSNOOP log in bugreport" am: f1cfae86f2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1400132

Change-Id: I5e7d1675164aa20fef15cad23b369e039e9c7f5b