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

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