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