Merge "vold: remove f2fs reserved_blocks from storage total size" into main am: 3da73d2c30

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

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