[automerger skipped] Merge "Revert "Skip restore of read-only directories""...

[automerger skipped] Merge "Revert "Skip restore of read-only directories"" into sc-v2-dev am: f31dd155 am: f85459ec am: 5b3b4dfa am: ff54fc3d -s ours

am skip reason: Merged-In I644a5784fb42352ba28ac944d3aa3564b0215a78 with SHA-1 62c0cec8 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: If8d21d11d833f1c462d4f94505839d31090178d0