Merge "Update the documentation for content provider security." into gingerbread