Merge "Merge "fs_mgr: fix checking for casefold feature already enabled" am: 154bd7e031 am: 06f8bd9e37" into rvc-dev-plus-aosp