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: 52218b99 am: cbac180a -s ours am: 4f784ac9 -s ours am: e4e9ab76 -s ours" into tm-d1-dev-plus-aosp am: e972be69 -s ours am: 311d54be -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: I54ab41738ad684e57b04f983ae6ba5dd5e822d5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>