[automerger skipped] Merge "Add logging to KeyguardNotifVisProvider" into...

[automerger skipped] Merge "Add logging to KeyguardNotifVisProvider" into tm-dev am: 5060905a am: c45894f7 am: 93925524 -s ours am: 6689287c -s ours

am skip reason: Merged-In I608b857c9796ed37ba75ca51d8ab0d95df754fa4 with SHA-1 d97b31f4 is already in history

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



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