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

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

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