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

Change-Id: I7fd3115375311498c4bd54b59665e5e23d9caffb