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

[automerger skipped] Merge "remove sensitive pii from safetynet logging" into pi-dev am: f2972ed9 -s ours am: d2827da3 -s ours am: 3f350251 -s ours am: c5b49da5 -s ours am: 9a1b6f15 -s ours

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

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

Change-Id: Ia885490592fc0907c549660f817337db146cbc3b