Merge "Merge "Support apps sharing file:// URIs with the camera API" into...
Merge "Merge "Support apps sharing file:// URIs with the camera API" into rvc-dev am: efbc3f2d am: 2d19d79a am: 0f921c8a" into rvc-qpr-dev-plus-aosp am: c29b161a
Original change: undetermined
Change-Id: I7b8d10d8b0419bd17f0b6ac6d36a4a90723b467b