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

[automerger skipped] Merge "remove sensitive pii from safetynet logging" into qt-qpr1-dev am: ffd39d68 -s ours am: 4a8b72ff -s ours

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

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

Change-Id: I2dfa454f6194a55eeb2b6c398703c0dc9fae2441