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

Change-Id: I68fd63dda5545f013f23bceada0e8822f1b8a329