Merge "fs_mgr: Add force_super_partition bootconfig option to avoid slot suffixing alternate super partition names." am: b738b7d23a

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

Change-Id: Ic47f79da15acfda4b4f7dac2d49ea249d758bce1