Merge "Themable volume and power dialogs" into oc-dr1-dev am: 59aadea809
am: a35d4bc639

Change-Id: I949028d0efda4b01141346bb008b32eed8cb4a76