Merge "ServiceManager: add isDeclared"
am: c9c2f0c858

Change-Id: I1614b9605037d9cd750c08d970945def22d936e0