[automerger skipped] Merge "Add new @SystemApis for RCS dependencies" am: 6408fa473f am: dd840cdaae am: f30c746b69 -s ours
am skip reason: Change-Id Id25bfffc1c40db8b183206dc598165272da7356c with SHA-1 f8e4614a91 is in history

Change-Id: Ic6bd48b2ce0537eb89a0b23f18341bc484c27e58