Merge "Update some ContentResolver docs." into rvc-dev