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

Change-Id: I79631a4f48f0c77d7e6be0e333c397bc92bb75e9