Merge "[Split shade][Motion] Fix scrim not being fully opaque after shade...

Merge "[Split shade][Motion] Fix scrim not being fully opaque after shade expansion" into tm-qpr-dev am: 0ec6e127 am: aad63c5e

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



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