Merge "Rename bindService to bindServiceAsUser to follow convention."