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

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

Change-Id: I873e0e99b6671858cdbc4ed85312f77fd2bbe077