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 am: 46ca9f3d
Original change: undetermined
Change-Id: Ie3e406e4ae7a56b6b1c4e213032f8b005047dd15