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

[automerger skipped] Merge "remove sensitive pii from safetynet logging" into qt-dev am: b7e43562 -s ours am: 42a1a00d -s ours

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

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

Change-Id: I0ad7352c464da0b2b7eca4a1b7c2c48601d0e977