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

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

Change-Id: I49f5a8d2848e7d582618533826792330b73ada26