Merge "Support apps sharing file:// URIs with the camera API" into rvc-dev am:...
Merge "Support apps sharing file:// URIs with the camera API" into rvc-dev am: efbc3f2d am: d371efcf
Original change: undetermined
Change-Id: Ie50c75f157b29fd2376faa2cc9510b64b3a57432