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

Change-Id: Ieef272563ab13c9bad7b7f062f2778bb2a7062d1