[automerger skipped] Merge "Remove package name from SafetyNet logs" into qt-dev am: 2c12354e77 am: ca9d475ba4 -s ours am: d307aa8bed -s ours

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

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

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