Merge "Remove dead code from fs_mgr" am: 50d89e6351 am: 79fecb2f8d

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

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