[automerger skipped] DO NOT MERGE Restrict access to directories am:...

[automerger skipped] DO NOT MERGE Restrict access to directories am: 01006f7f am: 2c48e201 -s ours am: b70e319d -s ours am: c8b4b102 -s ours am: 7497687a -s ours am: cfeba24c -s ours am: 36abdb7b -s ours

am skip reason: contains skip directive

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



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