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

Change-Id: I5f6f95eceee28ddccabdfda1428c1e9672e1302b