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

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

Change-Id: I8326845571ca83e7b8c06f3d697412f3e22d8493