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

Change-Id: Ib9ad21f2f3690436f3c3aa2a4ccb1991f8a51d14