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

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

Change-Id: I2acad023593545caf527cb3d85b8331c1b7b929a