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

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

Change-Id: I63acd430b65b9c843e6d237f18113272ac98499c