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

[automerger skipped] Merge "Add logging to KeyguardNotifVisProvider" into tm-dev am: 5060905a am: ce87b15b -s ours am: 692bbbac -s ours am: 4fec860a -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: Ie130c91ac43166eecb61d67e45466cdd7f01fd84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>