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

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

Change-Id: Ife20c755f8d0c83c97861fab235cba31a2d976bc