[automerger skipped] Merge "Restrict access to directories" into tm-dev am:...

[automerger skipped] Merge "Restrict access to directories" into tm-dev am: bdb0a0c2 am: 76492be4 -s ours am: c06e5e5a -s ours am: d20c15c7 -s ours am: 96ddbf06 -s ours am: 55f953b0 -s ours

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

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



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