Merge "Update some ContentResolver docs." into rvc-dev am: 2806da306b am: 7affd8ffe6 am: e3afc5a2a7

Change-Id: Ife5aa1ceb533b4c2e6f39d5ecd9c2e3b2c82bae6