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

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

Change-Id: Ic2c59f97c262e1dd878c3ef4139c19e8793c66fc