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

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



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