Merge "Remove dead code from fs_mgr" am: 50d89e63 am: 79fecb2f am: 66ac89b1 am: 8da41428

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



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