Merge "Add READ_EXTERNAL_STORAGE permission to android.content.cts" into oc-mr1-dev