Merge "[automerger skipped] Merge "Remove package name from SafetyNet logs"...

Merge "[automerger skipped] Merge "Remove package name from SafetyNet logs" into sc-dev am: 0edf5059 am: 423fd820 -s ours am: 96910a58 -s ours am: 4b20dff6 -s ours" into tm-d1-dev-plus-aosp am: b2fc766d -s ours am: 2cf85130 -s ours

am skip reason: Merged-In I4b61d13256ce0bfb8fc9d21db52ee78ce2097f14 with SHA-1 45b23196 is already in history

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



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