OPP: Restrict file based URI access to external storage am: ed63da62d4 am: 34bb42918c am: 486b64fef4  -s ours am: 48b3b4713c am: 69a19627ff am: c7cc23f77c am: 65ba1f1712
am: b95bd54199

Change-Id: Iffa0a72ac38bb22aedcbe8f250b4acbf84ef8bcb