Merge "Restrict access to directories" into tm-dev am: bdb0a0c2a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29287880

Change-Id: I23ed920dd6ebccb6bb2e7c23889be4ff2aae601d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>