Merge "Whitelist ACTION_QUICK_CONTACT from StrictMode.onFileUriExposed" into oc-dr1-dev
am: c4ccefc7fd

Change-Id: I2701f1fc12d487d23200ef8e5509535656fe27fe