[automerger skipped] Merge "Set correct volume storage path for SDK sandbox" into tm-dev am: 0b28d292 am: 584965a6 -s ours

am skip reason: Merged-In Ib72ea559363cdeb4b7cfcc2f48ca8ddace96e352 with SHA-1 79241ae7 is already in history

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



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