Merge "Change brightness dialog theme" into oc-dev am: 3b5934b267
am: c4d9ac6d18

Change-Id: I648fc03f0fb1395f6ac0e8bd77b7389afa30891b