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

Change-Id: I586578798e6b4133120bcd59b6843075edfeeb5f