Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev