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 am: 8a7fbb9e

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



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