Merge changes If530edaf,I7f11a135,I28412f24,Ia27a61fa,If221e239 into main am: f15785a54d am: 56e7c29466 am: 24a5445880

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

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