Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev