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