Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a6017e am: c64c204f59
am: 7e3661be1e

Change-Id: Id3ed1606bed208b8da758c3f86eadf1ccf6563cf