Merge "Fixing shade expanded after unfolding and unlocking with fingerprint"...

Merge "Fixing shade expanded after unfolding and unlocking with fingerprint" into tm-qpr-dev am: 7c093004

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



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