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

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

Change-Id: I2d0fb7f2cbfc89be1da93aa1568ba110916a64f8