Merge "Fix ClassCastException for ImsExternalConnection" am: a8cea75fc3 am: 332ff266ee
am: 4b0d285847

Change-Id: I49b807553ba26e2c66da651af24c3d15c320e496