Merge "Update some ContentResolver docs." into rvc-dev am: 2806da30 am: 7affd8ff am: e3afc5a2 am: c4e23ceb Change-Id: I3aba91500075b89e598fa5ff21225b8972f7a442