Merge "Merge "When opening from locked shade, wait for the shade to unlock...

Merge "Merge "When opening from locked shade, wait for the shade to unlock before expanding." into rvc-dev am: f1f28c8e am: e6a7a0e1 am: bd80ec63" into rvc-qpr-dev-plus-aosp am: 144758b5

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

Change-Id: I90fe0c9015d9e37deb703d9e4da1f978e58de3eb