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

Change-Id: I0ea5462db449403c6a1a03267c87b7be9bc66174