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

Change-Id: I14947611e687399221701b82401fd0efcee09e11