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

Merge "[automerger skipped] Merge "Remove package name from SafetyNet logs" into qt-dev am: 2c12354e am: ca9d475b -s ours am: d307aa8b -s ours am: 98fa0f5b -s ours am: 3c6d0b80 -s ours am: c8f27550 -s ours am: d0fcd513 -s ours am: 2fe0848f -s ours" into tm-d1-dev-plus-aosp am: 7f7f242e -s ours am: 308eb8e0 -s ours

am skip reason: Merged-In I993832e148636f1795ffe393c6dc74a08b9442f8 with SHA-1 bbe2a118 is already in history

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



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