[automerger skipped] DO NOT MERGE Revert "Skip restore of read-only directories" am: 70b82440 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6413681d3f72098c5190255e38672dd76fa8c756