Merge "Updates training/camera/photobasics.jd with FileProvider details" into nyc-dev am: 8f6c64d459
am: 5fc108a3c2

* commit '5fc108a3c200a370cdec1bc4e0f786b93270d1e6':

Change-Id: Ia2e97a9e6599244a874944459ecee16e27476c9e