[automerger skipped] [automerge] Revert "Revert "Skip restore of read-only directories"" 2p: 9e7c309c am: 95b37f46 am: 38f8f297 am: 5096cecf -s ours

am skip reason: skipped by user rthakohov

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

Change-Id: Ia3aefe80a86c827f29ba8dec9e96bbf7609d6eab