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

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

Change-Id: I0502399506235078a7d99e1adcb9a1da29cdaf74