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

Change-Id: I98a0ff03f1de40e3092da47eaae2a3febfe1bd60