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

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

Change-Id: I49e647adf9a98ea4b34de3297d0c3b886c4ee0b8