Merge "Check for null call id in ConnectionServiceWrapper" am: 9ee28de248 am: 198be8e2b7

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

Change-Id: Ifd2a95cf8faf09c3423a710fff351af78c7327e0