Merge "Merge "Add SafetyNet logging for security fix." into tm-dev am:...

Merge "Merge "Add SafetyNet logging for security fix." into tm-dev am: ff27baad am: 2a0c5501" into tm-d1-dev-plus-aosp am: 874e4687

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



Change-Id: I61b62a5245a23c4539972cfe6f6f70bd296b8330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>