[automerger skipped] Merge "Add flag for having tools read directly from new...

[automerger skipped] Merge "Add flag for having tools read directly from new storage" into main am: 6c3af91d am: 389d32b3 -s ours

am skip reason: Merged-In If326273374d3fad021d6e4da53bc0ae2b197c909 with SHA-1 c9b06e27 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3414081



Change-Id: I21df967a70ec94fa6207bdd8e6753ca5c8f76297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>