Merge "Fix NPE in NotificationMgr" am: 181e7c1db7

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

Change-Id: I49f4dce8669ffeeee651772ddb37ca8c63fe1e58