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

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



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