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

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

Change-Id: I8f7746e16b1e60fbc29a93dae3046b05f00c212d