Update for IServiceManager service retrieval APIs.
am: 7623781d8a

Change-Id: I5e56d5a8317429be11459051b2af31af79606d4e