Merge "Fix issue where screen off is disabled after expanding then collapsing the shade." into sc-dev am: 3d896663 am: f192ae32

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

Change-Id: I90d8f2d003fbcc12b46e8aa97f2f9f78d7ffc812