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 am: b8dd27d2
Original change: undetermined
Change-Id: I7b34b29c6cef114420491bb1710f240e38b3981d