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

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

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



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