Merge "Update some ContentResolver docs." into rvc-dev am: 2806da306b am: 86f3ab91d7

Change-Id: Id2261ba6571205e0212d95d81f041da7c78d688d