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: d371efcf am: fd2eaf09" into rvc-qpr-dev-plus-aosp am: 83e86e56
Original change: undetermined
Change-Id: I9e8ac6172a2646d5c999c99f7aa3b7e8f85ac5d6