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

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

Change-Id: I4620019b3ee2f13f9598436cc70b5995f7f26b19