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

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

Change-Id: I117b2d71e590ddeb8f060ff92ef11087aac23035