Merge "Restrict access to directories" into udc-dev am: c3872b4307

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

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