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: fd2eaf09
Original change: undetermined
Change-Id: Id74c52064e2f263436067abb5239405020debcb0