Merge "Fix ClassCastException for ImsExternalConnection" into pi-dev
am: 9f2fa00b60

Change-Id: If2bba29249cc6288e8dd0425f0d7ece8116796c9