Merge "Merge "Update the ScopedDirectoryAccess sample." into nyc-dev am: e0c04505 am: 5a40d8bc" into nyc-mr1-dev-plus-aosp am: b5776279 * commit 'b5776279': Change-Id: I70fed441b2d9270392a8270655a9dbfe9a705014