Merge "Fix QS squishiness on LS shade transition" into tm-qpr-dev am: 3f9d7e2f

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



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