Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev am: 3d89666385 am: cc8ebcaf9d am: d3c9519ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340719 Change-Id: I9ca04ed82627f22bc312021ab732eed50f6feb48
This commit is contained in: