Merge "Update ContentResolver documentation."