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

Change-Id: I4102629a798cbf520965a0141d8e89d5e87fa756