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

Change-Id: I3c10e76be4266bb4f43306ca3f0c7362499208f7