Merge "Replace NotificationManager @hide APIs" am: ff4b8b180c am: 6ae7712499

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

Change-Id: I89085c9a06abd61d987659f7283f8dfdc7718c3a