Merge "Correct reserved blocks to segments" into main am: ab2b49bb am:...

Merge "Correct reserved blocks to segments" into main am: ab2b49bb am: 4922ef26 am: b8db6789 am: 10987fcf

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



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