Merge "More dimming tweaks (for accessibility)" into oc-mr1-dev
am: dbb448a3d7

Change-Id: I94fe9f6055a48cdc596fe333a3f6d304cb7e33da