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

Change-Id: I2303c2b3152b6813178829f7cd6c0e3e86faaadc