Merge "Properly fixing expansion state in lockscreen to shade transition" into...

Merge "Properly fixing expansion state in lockscreen to shade transition" into tm-qpr-dev am: b8b70b0a am: 66f4ed26

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



Change-Id: Ic297f822a1ea724d2836d0d914bb1bd42ea97690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>