Merge "Fix ClassCastException for ImsExternalConnection"
am: a8cea75fc3

Change-Id: I94b57f8ec4db9037b8ac618416d3fa6be5e7d714