Merge "Move RCS UCE out of Telephony Mainline" am: 07ba9c6fff am: 5a05ae1270

Change-Id: I57e27f7314692bbaa882216405deca80ded92ad1