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

Change-Id: I79ce0e73daf319f0cf5ee5fd3e3b3df6ad3a1be2