tree 81a770f89615d4c2b3f80a50f80e034973825f66
parent c79d89d3520c21a9a6059403f04459aad5f1f52e
parent 4676b3104e0fad22958bac2d709945d925b3f9db
author Sarah Chin <sarahchin@google.com> 1605786688 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605786688 +0000

[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