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

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



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