Rename bindService to bindServiceAsUser to follow convention.

This is for the multi-user version of bindService, not the original.

Conflicts:

	services/java/com/android/server/ServiceWatcher.java
	services/java/com/android/server/accessibility/AccessibilityManagerService.java

Change-Id: Ib2de35941196accf387b1a276a77e6f9af805ec0
Fix lingering merge fails

NOTE: There "may" be more work here. The telephony was checked out
from cm10.2, thanks guys. As well as the PowerManager assets

Change-Id: I6c862f86fe3e663f3ee277fd99d7ea40e60d60fe