[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: 92fbc460 -s ours am: 418e62c2 -s ours am: 755dfd4b -s ours am: 9c2c3755 -s ours am: 7456ab30 -s ours

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

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

Change-Id: I959f3d6ff894c7289b2ef9afc68381e1a4ddf3a5