Merge "Unhide RcsMessageStore APIs" am: 231a9cb709
am: 6dbf0e96f0

Change-Id: Id69f0f74c9789b8324714a2580917db7b9f97acd