[automerger skipped] Restrict access to directories am: 6853df6f -s ours am:...

[automerger skipped] Restrict access to directories am: 6853df6f -s ours am: 09d0ecfd -s ours am: 2a271b84 -s ours am: f9668dba -s ours

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

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



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