Merge "AOD: Refactor low and high brightness modes" into oc-dr1-dev
am: 930297e040

Change-Id: I7fce673716a81aaadcfc24eaa6af61e14348c1e1