Merge "fs_mgr: allow specifying HEH filenames encryption"