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: 3a2f3893" into rvc-d1-dev-plus-aosp am: b905491d am: e6a03a69

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

Change-Id: I2800b8b5aacd94c8dad9221b5142dc9d3ddfc9ef