Merge "Modified not to occur NPE when handle call of failed connection" am: 4ebfefaca5 am: 6073f10824 am: fb6fb9e754

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

Change-Id: I303ee33e550e9806dc014f9f42b2fedec2f5f280