Merge "servicemanager: isDeclared error is 'INFO'" am: f221674338

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1953643

Change-Id: I15269a7315b066ef56e49773012c8b98e1e25259