OPP: Restrict file based URI access to external storage am: 3edd7f0a am:...

OPP: Restrict file based URI access to external storage am: 3edd7f0a am: 15fd305d am: 239c9762  -s ours am: 89ad54e8 am: 45e6bb94 am: f955b967 am: 4a7f0f81 am: cd2a70b8 am: 76f57b21 am: db4157b0 am: d8ae136b am: 92f1af04 am: 5f31e3fd am: d93beba6 am: 651c55b4
am: bd585ef7

Change-Id: Ic9f463ab1030344a0c104525497643f39c2034bf