Merge "Do not export RcsProvider"
am: c92dc3df15

Change-Id: I0b5564d2339b0215843a8ce37367ee70aff48a94