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

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

Change-Id: I6a1305da54941668353d9b992caaa15c19ea2383