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

Change-Id: I018804fb7e5ce7db9351633f50eb572d46714fae