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

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



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