Merge "Add UCE Call Composer + enriched calling tags" am: feaed68912 am: 8e637e628f

Change-Id: I2abc0d201c828e198eae5f366112803e5d568dd4