Merge "ServiceManager: add getDeclaredInstances" am: 9ff2444ba7 am: b1b830369e am: 7ceee368ee am: f5f4344d2f am: 4acdea4cb8

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

Change-Id: I0cffc23dc0d96cacd7c546b42391af33f54ada80