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

Change-Id: Ifff8ca3247d97028c64094a27263f9620f36f31c