Merge "Revert "Revert "Skip restore of read-only directories""" into sc-v2-dev am: 2992ddf6 am: 0ef51972 am: c739764c am: bbd4cd4a

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

Change-Id: I07d342aea316541234d22431998d93f9e971f53a