Merge "Add ServiceManager.registerForNotifications" am: ce80de5db0

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

Change-Id: I65215f414aced825be29e036c378057d9c861138