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

Merge "[automerger skipped] Merge "remove sensitive pii from safetynet logging" into rvc-dev am: 6ad81384 am: de29b83c am: e712121b -s ours" into rvc-qpr-dev-plus-aosp am: 661d9aca -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/+/12840275

Change-Id: I4d4397fbac364566282a57b44222acf937217a06