Merge "Fix NPE in NotificationMgr" am: 275c433d77 am: 8597576a73 am: ef2919063f

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

Change-Id: I287e539c3f3be5f46e16e8dc91d6ce5c23997890