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

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

Change-Id: Id8e534956675c4ea5d5e2d89a5cd3216098b814f