Merge "Don't animate unlocked screen off if QS is expanded" into tm-dev am:...

Merge "Don't animate unlocked screen off if QS is expanded" into tm-dev am: c495949e am: 4ef5d6d2 am: f11ae2b6

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



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