Merge "Merge "Remove package name from SafetyNet logs" into tm-dev am:...

Merge "Merge "Remove package name from SafetyNet logs" into tm-dev am: 9567592b am: a379fc68" into tm-d1-dev-plus-aosp am: 50df1bc7 am: 039c038d

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



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