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: 2d19d79a
Original change: undetermined
Change-Id: I8d9cce3ebf29d3c3b4445b69154e2bf513001621