[automerge] Revert "Revert "Skip restore of read-only directories"" 2p: 9e7c309cf2

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

Change-Id: Ie3ba10949b17d013c157b0657a91ac9ffe48c344