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

[automerger skipped] Merge "Restrict access to directories" into tm-dev am: bdb0a0c2 am: c57b3187 -s ours am: 41f729cb -s ours am: 032d05ed -s ours am: ed81f14d -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: Icd25eaa664690b1ab6d08a9555bacaee35d6599b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>