Merge "Fix NPE in NotificationMgr" am: 275c433d77

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1505152

Change-Id: I4ca1ad266130067b88111ed911e8f5c02ba896b8