[automerger skipped] Merge "Restrict access to directories" into udc-qpr-dev am: 92ab6d1b -s ours

am skip reason: Merged-In I8879900e57e1702d11797b81e86d0cc3f55bac22 with SHA-1 b9143702 is already in history

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



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