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

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

Change-Id: I7755509b329914c491a205f843e731694b02ce84