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

Change-Id: Ic3310f5c66ecb0e175153b9e398326cc50fca06a