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

Change-Id: Ia93bb8ee554f23c9c4bd29e5178275314bdac327