Merge "Scoped directory access api is not supported on ATV."
am: f72f17e6a3

Change-Id: Ic302970e2f4115b282975f654dd6d762bd6af636