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: 94d347aa -s ours" into tm-d1-dev-plus-aosp am: bb45de0d -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: I5f8935d03b0b42c2ad9d04410ef679a434073f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>