Merge "Fix scrim opacity in the brightness mirror" into oc-dr1-dev
am: c393be76d9

Change-Id: I37af2f178220bc7cd0b6fbac51d6cf3f84193ab9