Merge "Updating brightness override for AOD." into oc-dr1-dev
am: 68d2488991

Change-Id: I4650b5b1cd1b1dca41be66cdcf17390cb17e7ea9