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

Change-Id: I9b6449e44d35f5c32fe6ac93927048f780ec8921