Merge "fs_mgr: fix checking for casefold feature already enabled" am: 154bd7e031

Change-Id: I3c23d4bc78dca61397e4720dfe4752fcb570fef5