Merge "Add new @SystemApis for RCS dependencies"
am: 6408fa473f

Change-Id: I67f07097d729a2f89fff80d61429c36fe048e9fe