Merge "On occlusion: use AUTH_SCRIMMED scrim state" into tm-qpr-dev am: 64d3a0e6

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



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