Merge "Make RCS Message Store APIs ready to unhide" am: 90f86257f0
am: b4cd2e4135

Change-Id: Id7caac238695dce90314e0f72f76422d141ed351