Merge "Updating some PowerManagerService proto messages."