Merge "ServiceManagerProxy: implement new method" am: 2a6f6ed94b am: 9ab8a0713f am: 1574e4fd4e
am: 156230b3bf

Change-Id: Id21faff58a559d052dfc6da049f6cd445964852d