Merge "Modify RCS UCE APIs to use AIDL Interfaces." am: 4204a601 am: c64c204f am: 7e3661be am: a33d1aed am: ce95274a Change-Id: I73e17b8b410c6c026ca797331ccb03a0d70975d4