[automerger skipped] Merge "DO NOT MERGE Restrict access to directories" into...

[automerger skipped] Merge "DO NOT MERGE Restrict access to directories" into sc-qpr1-dev am: d676ed9f -s ours

am skip reason: contains skip directive

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



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