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

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

Change-Id: I0771a610c414941087f0ca3f9f141cc359254fbc