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

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

Change-Id: I84b83851961a0215f0a98b5112b6ef3ac4e889ad