OPP: Restrict file based URI access to external storage am: 3edd7f0a8a am: 15fd305d28 am: 239c976247  -s ours am: 89ad54e8cf am: 45e6bb94bf am: f955b96701 am: 4a7f0f8140 am: cd2a70b8ce am: 76f57b2109 am: db4157b0ae
am: d8ae136bc3

Change-Id: Ib9075dc2c234c9ff64750438346bc5729ab5b09b