Merge "IMS: Add support for call deflection feature"
am: 9109db707a

Change-Id: If273f50f5bd6a1d72dc2fdad063d62db0be4812d