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

[automerger skipped] Merge "Restrict access to directories" into tm-qpr-dev am: 1fa155fa -s ours am: 8681bd1d -s ours am: a9a4505e -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: Ia69d7da20a705708eb163028252c70e9a2b03cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>