Merge "ServiceManagerProxy: implement new method"