Merge "Fix bouncer scrim animation on split shade" into tm-qpr-dev am: cb570a34 am: 5e3399b1

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



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