Merge "Set correct volume storage path for SDK sandbox" into tm-dev am: 0b28d292

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



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