Merge "ServiceManagerProxy: implement new method" am: 2a6f6ed94b
am: 9ab8a0713f

Change-Id: I5af655cba2bb416ed517ba722f0f5ec46610c9bc