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

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

Change-Id: If9608e679c23264620851b29322ed66fe5fe3d12