Merge "Remove getIsimChallengeResponse" am: b6d5a85a9c am: c13ddc2fe0
am: e69ef2e511

Change-Id: I4117e88b3c6360d9b6c542f53826bef612572700