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 am: c6906b21af am: 72ffe089a8 am: b0aef2920b
am: d4b2dcb4a7

Change-Id: I1aba1e1e9eb3d3e480e98672c59669d2bb55419c