Merge "remove sensitive pii from safetynet logging" into rvc-dev am: 6ad81384 am: de29b83c

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

Change-Id: I4f145de69a6e8ea5fe038386017db1f1bb2a63a4