Merge "ServiceManagerProxy: New method implementations" am: b2d8eb58a2 am: b88261b982 am: 3990bf8ba0

Change-Id: I876a25019dc9245671e1ffe53b7e3627877693ff