[automerger skipped] Merge "Refactor SysUI's interface with...

[automerger skipped] Merge "Refactor SysUI's interface with ATMS#setLockScreenShown/keyguardGoingAway." into udc-qpr-dev am: 9c708647 am: 15997fd9 -s ours

am skip reason: Merged-In Iaacccacbbc408bf5d39b32016b981199aa36dcc0 with SHA-1 0a4050f9 is already in history

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



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