[automerger skipped] Merge "Remove RcsProvider" am: 869c401773 am: 797e61a6a5 am: 3b89edad93 -s ours
am skip reason: Change-Id I03b81e5e6ffef4ac8fee3d20d6475b1a8f918d02 with SHA-1 3a16d4cafa is in history

Change-Id: I8b9ed9ee0dba337620ca87a602a1d63fb5fe4084