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

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

Change-Id: I9b9d11a618fe3ae1b072e268fe5efaf4747203bc