Merge "Revert "Skip restore of read-only directories"" into sc-v2-dev am: f31dd155 am: f85459ec am: 5b3b4dfa

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

Change-Id: I1cea211e5ad9dcd0e45c95adb1a47105f2a2179c