Merge "Merge "Add SafetyNet logging for b/79776455" into rvc-dev am:...

Merge "Merge "Add SafetyNet logging for b/79776455" into rvc-dev am: 0b2bb19d am: 8c79a511" into rvc-d1-dev-plus-aosp am: 2ef3edbb am: dff98c0f

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

Change-Id: Ie028ede2da8dc621282096aceacec23825fe3400