[automerger skipped] Merge "remove sensitive pii from safetynet logging" into qt-qpr1-dev am: ffd39d6863 -s ours am: 4a8b72ffc9 -s ours am: d7600974bc -s ours am: ab3ea1121f -s ours am: 072cd2a80d -s ours

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

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

Change-Id: I3e66a0540a8fdcf5191577d00792ca481b6ebde5