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