Merge "LocationManager: move impl of setLocationEnabledForUser to server"