Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea am: 0e2959a56b

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

Change-Id: I3663ea2b95ec7815e84fa0729c39591280a90847