[automerger skipped] remove sensitive pii from safetynet logging am:...

[automerger skipped] remove sensitive pii from safetynet logging am: 1d507600 am: 05aa1497 -s ours

am skip reason: Change-Id I8f1be55971672c7e8f5aa8848f65b1b9d9f40fb5 with SHA-1 3b6905bf is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12840255

Change-Id: I61136b933b07b4cc1b64aa41cd7dcca947ca9c40