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

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

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