[automerger skipped] Merge "Set correct volume storage path for SDK sandbox"...

[automerger skipped] Merge "Set correct volume storage path for SDK sandbox" into tm-dev am: 0b28d292 am: 49f81abc am: ad494b49 -s ours am: 23a363e5 -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: If01fb45250718c28f7bea680ba55e1fd1dfdfd4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>