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

Change-Id: Icdf6ed6ef04691090a40bfa643394e3ddfea823d