Merge "Add ServiceManager.registerForNotifications" am: ce80de5db0 am: 45ddf12cbc am: 3b546f86e0

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

Change-Id: Ic5346dff7ffdb0f2d0d8e911cb931db167c7a2b0