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

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

Change-Id: I5fbf409fa3eff20348be48e70cf995cded976524