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

Change-Id: I6400941fbb285c7aec8c82c8c09eb3f83982e52d