Merge "Merge "Shutdown scrim opacity at 95%" into oc-dr1-dev am: 53ddffdf3a am: 94e56bc598" into oc-mr1-dev-plus-aosp
am: a2c01093b5

Change-Id: I72a0aeb4c844ab145f09e07dc3d1a731c245d247