Merge commit '6bc34da8acf26c8e70325719fe43eaf22489809d' * commit '6bc34da8acf26c8e70325719fe43eaf22489809d': Revert "Update the documentation for content provider security."
Merge commit '6bc34da8acf26c8e70325719fe43eaf22489809d' * commit '6bc34da8acf26c8e70325719fe43eaf22489809d': Revert "Update the documentation for content provider security."