Merge "Fixing tiles on lockscreen and scrims transitions with QS expanded"...

Merge "Fixing tiles on lockscreen and scrims transitions with QS expanded" into tm-dev am: 3950e281 am: b4bd10d5 am: 36c4bd00

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



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