[automerger skipped] Merge "Remove package name from SafetyNet logs" into rvc-dev am: fa04b36240 am: 2cef59d6fd -s ours

am skip reason: Merged-In I8f823487ca16861a35135cfc3383fa2ce8258017 with SHA-1 dfeea39dbc is already in history

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

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