Merge "IMS: Avoid to set CLIR after click cancel Fixes: 131474029 Change-Id: I55aa18685746145fc478a5b03d8b887cfbc1281d" am: 93d1c41644 am: faf137207f am: 4e6a142f3c

Change-Id: I03ea6a2b42fa85a59f5acaac09bb8a85f0a54737