Merge "Use KeyguardStateController to listen for unlocked shade state" into tm-dev am: 8649b508

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



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