Merge "Remove getIsimChallengeResponse" am: b6d5a85a9c
am: c13ddc2fe0

Change-Id: If67d532c0ab0cbd778650cd2a6bd33b91f0459e5