Merge "Merge "Merge "Update some ContentResolver docs." into rvc-dev am: 2806da306b am: 86f3ab91d7" into rvc-d1-dev-plus-aosp am: aeba9557f4" into rvc-qpr-dev-plus-aosp