Merge "Modify RCS UCE APIs to use AIDL Interfaces."