Merge "Fix brightness dialog background to be light" into oc-dev
am: 175f53b2d6

Change-Id: Ic062c499bbb5a5aade5da15a6a038324e47a866e