Merge "ServiceManager: add getDeclaredInstances" am: 9ff2444ba7

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

Change-Id: I8abce3a2b402056703e3909f9395eba56bde517d