Merge "vold: include multiple devices for calculating storage size" into main am: 305620215e

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3349457

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