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: 0c066db9 am: aadde95b

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



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