Merge "Fix some compiler warnings in vold" into main am: 1e029dce71

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

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