Merge "Safetynet logging for b/204445255" into rvc-dev am: f708734821 am: 4425c09e39 am: 9d5da200a6 am: 3b6f9c51f8

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

Change-Id: I5efb8f666d9d76cb2a909cd1f2be798317b5db86