OPP: Restrict file based URI access to external storage am: f9fdf9fd am: 0da79070 am: fae982ee  -s ours am: bb91c98e am: d0bea068 am: 89be243d am: 2c8a5de9 am: a44d0330 am: f7f3880d am: f32e0e24 am: 1a4d4fd5 am: e5a9e285 am: fb8a8edf am: 9152bf47 am: bdd913ac
am: 00a9bb16

Change-Id: If0f2de85baeafeeeeff20f25ff521d3d4bf06a21