Merge "Update scrim controller directly with occlude animation status." into...

Merge "Update scrim controller directly with occlude animation status." into tm-qpr-dev am: e783cba9 am: feba1d2f

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



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