Merge changes from topic "presubmit-am-d7178652ff24438db859a4dbafaa0453" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Skip restore of read-only directories 2p: 98f8122702
  Skip restore of read-only directories