Merge "Clarify ContentResolver docs." into qt-dev
am: 81f5007d5f

Change-Id: Id76a05f4782d23a699c971077d391199c48a6173