Merge "Add NfcSNOOP log in bugreport" am: f1cfae86f2 am: 26b69560b1

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

Change-Id: I0db5371ffd35ba47c4e5a9f1b2496f675284369e