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

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

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



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