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

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

Change-Id: Icad9b9de18545175b58cef76cfb7893bce7c3717