[automerger skipped] Merge "Fix NPE in NotificationMgr" am: 275c433d77 am: 8597576a73 am: ef2919063f am: 4676b3104e -s ours

am skip reason: Change-Id I0c9b733ea143bfcffbb6ad58a9d47b408001ed6c with SHA-1 3d7af54f79 is in history

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

Change-Id: I7de90a471701df88ef3d37f7a5bc57007372141a