Merge "[Expressive design] Adjust override flag logic" into main

        }

        // Enable if overridden by system property

        if (getPropBoolean(context, IS_EXPRESSIVE_DESIGN_ENABLED, false)) {

            return true;

        }

        // Disable if feature flag is disabled.

        if (!Flags.isExpressiveDesignEnabled()) {

            return false;

            return true

        }

        // Allow the activity to override.

        val activity = getActivityFromContext(context)

        if (activity is ExpressiveDesignEnabledProvider) {

            return activity.isExpressiveDesignEnabled()

        }

        return true

        return Flags.isExpressiveDesignEnabled()

    }

    private fun getActivityFromContext(context: Context): Activity? {