Merge "Remove dead code from fs_mgr" am: 50d89e6351 am: 79fecb2f8d am: 66ac89b173 am: 8da4142839 am: a4b20ffedb

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

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