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

Change-Id: I0f6728a3b90a75bb0d91c28a108b56cadac8fc65