[automerger skipped] Merge "remove sensitive pii from safetynet logging" into...

[automerger skipped] Merge "remove sensitive pii from safetynet logging" into rvc-dev am: 6ad81384 am: de29b83c -s ours am: afd5bae7 -s ours

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

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

Change-Id: I633ccfb2e3047bb9eaf20c9d00e760d3c7f9c8b6