Merge "Split RCS events into API and internal classes" am: 609ea873b7
am: 7b46efda19

Change-Id: I2fc31c0fdc1e8eb203830dff9a7914e56ebda413