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

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



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