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

am skip reason: subject contains skip directive

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

Change-Id: Ie3565b6bf9b1173496c1edc6a2ad0114e95a8321