Merge "Use bindServiceAsUser to bind PacService and ProxyService"