Merge "Fixed an issue where a user could't go to the locked shade from dozing" into sc-v2-dev am: 5c3d8bc297 am: 9bbf07eece

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

Change-Id: Ib0a4422d6970246db11b7c81735bdf1fc8557441