[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: 3a460c07 -s ours am: dc993735 -s ours am: cbefaa82 -s ours am: 89d968da -s ours am: 4b7a279a -s ours

am skip reason: contains skip directive

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



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