Merge "Safetynet logging for b/204445255" into rvc-dev am: f708734821 am: 6f954d5e7c am: 8bfe498016 am: 4cd3c74353

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

Change-Id: Ib50fa8776a218bb2af3b54ec053c00842df901dc