[automerger skipped] Merge "Skip restore of read-only directories" into tm-dev am: 59317a8d00 -s ours am: b862834b88 -s ours am: 834484f5b9 -s ours
am skip reason: Merged-In I644a5784fb42352ba28ac944d3aa3564b0215a78 with SHA-1 98f8122702 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591523
Change-Id: I7bdfd873bd95fe033d479ef1de39776c0589f6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: