tree 14b84e8f0a0a2f71a61fdc9b13eb84b9277efc5b
parent 7d97d3fa7953328461bc8b7207699351832f4beb
parent 8597576a738a602a60d979c9eaad0056d16d5b84
author Sarah Chin <sarahchin@google.com> 1605779951 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605779951 +0000

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