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

Merge "[automerger skipped] Merge "remove sensitive pii from safetynet logging" into qt-qpr1-dev am: ffd39d68 -s ours am: 4a8b72ff -s ours am: d7600974 -s ours am: 16754110 -s ours" into rvc-qpr-dev-plus-aosp am: 5abb897a -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/+/12840256

Change-Id: If84f27f9ff8fec8d43e1b2d0ccd72a1163f08c5c