Merge "Scrim: Normalize behind scrim when unoccluding." into tm-dev am: 6cde647f am: 3370fe43

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



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