Merge "ServiceManager: add getDeclaredInstances" am: 9ff2444ba7 am: b1b830369e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436518

Change-Id: I7c8d6058ac7fc4434870d808325823fdc7972c19