Merge "fs_mgr: Separate the required modules of core and recovery variants"...

Merge "fs_mgr: Separate the required modules of core and recovery variants" am: 0e13b0eb am: 0df7808c am: 634c270a am: 88920e10 am: 1ee68d92

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1782809

Change-Id: I81d1a4fa2d8a6fcc22b2f4ac8538e71d32840735