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

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

Change-Id: Ia68a67e50a1da45bbde431b323b96836a8a8e094