Merge "ServiceManager: add isDeclared" am: c9c2f0c858 am: 4a44bce7ff am: 3900da85d6
am: ffc4a1bd48

Change-Id: I84b4d70cd87de40f81f1e99186d5c300dc98087e